Add the clusterupgrade feature config for the fleet Feature resource. #9614

kapreus · 2023-12-09T06:24:26Z

Add the clusterupgrade feature config for the fleet Feature resource. Fixes hashicorp/terraform-provider-google#16459

Release Note Template for Downstream PRs (will be copied)

gkehub2: added `clusterupgrade` to `google_gke_hub_feature` resource.

modular-magician · 2023-12-09T06:25:56Z

Hello! I am a robot. It looks like you are a: Community Contributor ~~Googler~~ ~~Core Contributor~~. Tests will require approval to run.

@shuyama1, a repository maintainer, has been assigned to review your changes. If you have not received review feedback within 2 business days, please leave a comment on this PR asking them to take a look.

You can help make sure that review is quick by doing a self-review and by running impacted tests locally.

shuyama1 · 2023-12-11T19:25:39Z

@kapreus Thanks for working on this feature. Would you mind following the Terraform internal contribution page to get your GitHub account registered, so the tests will be automatically triggered for your PRs. Thanks!

modular-magician · 2023-12-11T19:37:04Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 542 insertions(+))
Terraform Beta: Diff ( 3 files changed, 542 insertions(+))
TF Conversion: Diff ( 1 file changed, 153 insertions(+))

modular-magician · 2023-12-11T20:35:52Z

Tests analytics

Total tests: 3291
Passed tests 2953
Skipped tests: 338
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

…ature

modular-magician · 2023-12-12T00:32:28Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 542 insertions(+))
Terraform Beta: Diff ( 3 files changed, 542 insertions(+))
TF Conversion: Diff ( 1 file changed, 153 insertions(+))

modular-magician · 2023-12-12T01:30:36Z

Tests analytics

Total tests: 3291
Passed tests 2953
Skipped tests: 338
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

shuyama1

LGTM overall. Only some small comments

shuyama1 · 2023-12-15T22:06:57Z

mmv1/products/gkehub2/Feature.yaml

+                    - !ruby/object:Api::Type::String
+                      name: 'name'
+                      description: |
+                        Name of the upgrade, e.g., "k8s_control_plane". It should be a valid upgrade name. It must not exceet 99 characters.
+                    - !ruby/object:Api::Type::String
+                      name: 'version'
+                      description: |
+                         Version of the upgrade, e.g., "1.22.1-gke.100". It should be a valid version. It must not exceet 99 characters.


Can we make at least one of these subfields required to prevent users from sending empty blocks?

Done, made both of the fields required

shuyama1 · 2023-12-15T22:22:01Z

mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb

+  location = "global"
+  spec {
+    clusterupgrade {
+      upstream_fleets = [tostring(google_project.project_2.number)]


Suggested change

upstream_fleets = [tostring(google_project.project_2.number)]

upstream_fleets = [google_project.project_2.number]

I'd assume it should be working without tostring since number should be type of string: https://github.com/hashicorp/terraform-provider-google-beta/blob/main/google-beta/services/resourcemanager/resource_google_project.go#L102

Plus, just want to make sure if it will return the values in the order as they send for multiple entries. Otherwise, we'll need to implement it as set.

Done.
The order doesn't change; also, right now having more than upstreams is not supported

modular-magician · 2023-12-20T01:28:03Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 542 insertions(+))
Terraform Beta: Diff ( 3 files changed, 542 insertions(+))
TF Conversion: Diff ( 1 file changed, 153 insertions(+))

modular-magician · 2023-12-20T01:39:00Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 543 insertions(+))
Terraform Beta: Diff ( 3 files changed, 543 insertions(+))
TF Conversion: Diff ( 1 file changed, 153 insertions(+))

modular-magician · 2023-12-20T02:36:06Z

Tests analytics

Total tests: 3311
Passed tests 2974
Skipped tests: 337
Affected tests: 0

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

shuyama1

Overall LGTM! only one small nit-pick

shuyama1 · 2023-12-26T23:26:13Z

mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go.erb

+				ImportStateVerify: true,
+        ImportStateVerifyIgnore: []string{"update_time"},


Suggested change

ImportStateVerify: true,

ImportStateVerifyIgnore: []string{"update_time"},

ImportStateVerify: true,

ImportStateVerifyIgnore: []string{"update_time"},

nit: tabs for indentation here

modular-magician · 2024-01-02T23:22:41Z

Hi there, I'm the Modular magician. I've detected the following information about your changes:

Diff report

Your PR generated some diffs in downstreams - here they are.

Terraform GA: Diff ( 3 files changed, 543 insertions(+))
Terraform Beta: Diff ( 3 files changed, 543 insertions(+))
TF Conversion: Diff ( 1 file changed, 153 insertions(+))

modular-magician · 2024-01-02T23:29:09Z

Tests analytics

Total tests: 23
Passed tests 13
Skipped tests: 10
Affected tests: 0

Click here to see the affected service packages

gkehub2

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

modular-magician · 2024-01-02T23:40:02Z

Tests analytics

Total tests: 23
Passed tests 13
Skipped tests: 10
Affected tests: 0

Click here to see the affected service packages

gkehub2

$\textcolor{green}{\textsf{All tests passed in REPLAYING mode.}}$
View the build log

shuyama1

Thank you!

…GoogleCloudPlatform#9614) * Add support for gkehub clusterupgrade feature * Fix gkehub Feature indentation * Remove unnecessary tostring() call * Make upgrade type and version fields required for specifying overrides * Ignore update_time in tests * Replace tabulations with spaces

Add support for gkehub clusterupgrade feature

6828148

modular-magician requested a review from shuyama1 December 9, 2023 06:25

modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Dec 9, 2023

kapreus marked this pull request as ready for review December 9, 2023 06:26

modular-magician added service/gkehub and removed awaiting-approval Pull requests that need reviewer's approval to run presubmit tests labels Dec 11, 2023

Merge branch 'GoogleCloudPlatform:main' into gkehub-clusterupgrade-fe…

61f9954

…ature

modular-magician added the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Dec 11, 2023

Fix gkehub Feature indentation

5ca47bf

modular-magician removed the awaiting-approval Pull requests that need reviewer's approval to run presubmit tests label Dec 12, 2023

shuyama1 reviewed Dec 15, 2023

View reviewed changes

kapreus added 2 commits December 19, 2023 16:53

Remove unnecessary tostring() call

26f6c44

Make upgrade type and version fields required for specifying overrides

c5d8a59

modular-magician requested a review from shuyama1 December 20, 2023 01:16

Ignore update_time in tests

006b73d

shuyama1 reviewed Dec 26, 2023

View reviewed changes

Replace tabulations with spaces

e24bbaa

modular-magician requested a review from shuyama1 January 2, 2024 23:13

kapreus force-pushed the gkehub-clusterupgrade-feature branch from 48aecb1 to e24bbaa Compare January 2, 2024 23:25

Merge branch 'main' into gkehub-clusterupgrade-feature

1085082

shuyama1 approved these changes Jan 9, 2024

View reviewed changes

shuyama1 merged commit 1cb7c59 into GoogleCloudPlatform:main Jan 9, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add the clusterupgrade feature config for the fleet Feature resource. #9614

Add the clusterupgrade feature config for the fleet Feature resource. #9614

kapreus commented Dec 9, 2023 •

edited by shuyama1

Loading

modular-magician commented Dec 9, 2023

shuyama1 commented Dec 11, 2023

modular-magician commented Dec 11, 2023

modular-magician commented Dec 11, 2023

modular-magician commented Dec 12, 2023

modular-magician commented Dec 12, 2023

shuyama1 left a comment

shuyama1 Dec 15, 2023

kapreus Dec 20, 2023

shuyama1 Dec 15, 2023

kapreus Dec 20, 2023

modular-magician commented Dec 20, 2023

modular-magician commented Dec 20, 2023

modular-magician commented Dec 20, 2023

shuyama1 left a comment

shuyama1 Dec 26, 2023

kapreus Jan 2, 2024

modular-magician commented Jan 2, 2024

modular-magician commented Jan 2, 2024

modular-magician commented Jan 2, 2024

shuyama1 left a comment

	upstream_fleets = [tostring(google_project.project_2.number)]
	upstream_fleets = [google_project.project_2.number]

		ImportStateVerify: true,
		ImportStateVerifyIgnore: []string{"update_time"},

Add the clusterupgrade feature config for the fleet Feature resource. #9614

Add the clusterupgrade feature config for the fleet Feature resource. #9614

Conversation

kapreus commented Dec 9, 2023 • edited by shuyama1 Loading

modular-magician commented Dec 9, 2023

shuyama1 commented Dec 11, 2023

modular-magician commented Dec 11, 2023

Diff report

modular-magician commented Dec 11, 2023

Tests analytics

modular-magician commented Dec 12, 2023

Diff report

modular-magician commented Dec 12, 2023

Tests analytics

shuyama1 left a comment

Choose a reason for hiding this comment

shuyama1 Dec 15, 2023

Choose a reason for hiding this comment

kapreus Dec 20, 2023

Choose a reason for hiding this comment

shuyama1 Dec 15, 2023

Choose a reason for hiding this comment

kapreus Dec 20, 2023

Choose a reason for hiding this comment

modular-magician commented Dec 20, 2023

Diff report

modular-magician commented Dec 20, 2023

Diff report

modular-magician commented Dec 20, 2023

Tests analytics

shuyama1 left a comment

Choose a reason for hiding this comment

shuyama1 Dec 26, 2023

Choose a reason for hiding this comment

kapreus Jan 2, 2024

Choose a reason for hiding this comment

modular-magician commented Jan 2, 2024

Diff report

modular-magician commented Jan 2, 2024

Tests analytics

modular-magician commented Jan 2, 2024

Tests analytics

shuyama1 left a comment

Choose a reason for hiding this comment

kapreus commented Dec 9, 2023 •

edited by shuyama1

Loading